bitkeeper revision 1.1041.1.11 (40e4a214S0nMcVOgrtI0299yUPBMXA)

Merge http://xen.bkbits.net/xeno-unstable.bk
into gandalf.hpl.hp.com:/var/bk/djm/xeno-unstable-common.bk

diff --cc .rootkeys
index e843df9b042a9b0bfeb4ed1f4aa95dd2aeea51f7,d0ce50f487b8d67aaf2a07461e747e86e14bb5f2..5c57fbab491a193e26180497921e2d9b037cbe73
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -281,9 -303,9 +281,10 @@@
  3ddb79bcBQF85CfLS4i1WGZ4oLLaCA xen/arch/x86/Rules.mk
  3e5636e5FAYZ5_vQnmgwFJfSdmO5Mw xen/arch/x86/acpi.c
  3ddb79bcsjinG9k1KcvbVBuas1R2dA xen/arch/x86/apic.c
 -3ddb79bcSC_LvnmFlX-T5iTgaR0SKg xen/arch/x86/boot/boot.S
 +3ddb79bcSC_LvnmFlX-T5iTgaR0SKg xen/arch/x86/boot/x86_32.S
 +40e42bdbNu4MjI750THP_8J1S-Sa0g xen/arch/x86/boot/x86_64.S
  3ddb79bcUrk2EIaM5VsT6wUudH1kkg xen/arch/x86/delay.c
+ 40e34414WiQO4h2m3tcpaCPn7SyYyg xen/arch/x86/dom0_ops.c
  3e32af9aRnYGl4GMOaDKp7JdfhOGhg xen/arch/x86/domain_page.c
  3ddb79bcecupHj56ZbTa3B0FxDowMg xen/arch/x86/entry.S
  3ddb79bcY5zW7KhvI9gvfuPi3ZumEg xen/arch/x86/extable.c

diff --cc BitKeeper/etc/logging_ok
Simple merge

diff --cc xen/common/kernel.c
Simple merge